Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 25 Feb 2010 16:08:53 +0000 (17:08 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 25 Feb 2010 16:08:53 +0000 (17:08 +0100)

Trivial merge